From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 13 Nov 2009 10:35:39 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9519
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=58225bdcad36a4e7de2521534f039da244f1db94;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 547d317a6bc..fa3beffc34c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-13  Tomas Abrahamsson  <tab@lysator.liu.se>
+
+	* textmodes/artist.el (artist-mouse-choose-operation): Call
+	`tmm-prompt' instead of `x-popup-menu' if we cannot popup
+	menus. Bug noticed by Eli Zaretskii <eliz@gnu.org>.
+	(artist-compute-up-event-key): New function.
+	(artist-mouse-choose-operation, artist-down-mouse-1): Call it.
+
 2009-11-13  Kenichi Handa  <handa@m17n.org>
 
 	* language/japan-util.el: Make sure that the value of jisx0208